Skip to content

[cxx-interop] Make libstdc++ header and modulemap arch-independent #66855

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 23, 2023

Conversation

egorzhdan
Copy link
Contributor

This moves libstdcxx.modulemap and libstdcxx.h from *.xctoolchain/usr/lib/swift/macosx/arm64e to *.xctoolchain/usr/lib/swift/macosx to simplify distribution.

rdar://110788977

@egorzhdan egorzhdan added the c++ interop Feature: Interoperability with C++ label Jun 22, 2023
@egorzhdan egorzhdan requested review from zoecarver and hyp as code owners June 22, 2023 14:24
@egorzhdan
Copy link
Contributor Author

@swift-ci please smoke test

@compnerd
Copy link
Member

compnerd commented Jun 22, 2023

I think that this might require an associated change in apple/swift-installer-scripts: https://github.com/apple/swift-installer-scripts/blob/main/platforms/Windows/sdk.wxs#L418-L426

Copy link
Member

@compnerd compnerd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please test Windows installer for this.

@compnerd
Copy link
Member

@swift-ci please build toolchain Windows platform

@egorzhdan
Copy link
Contributor Author

Thanks @compnerd for pointing this out.

@egorzhdan egorzhdan force-pushed the egorzhdan/libstdcxx-arch-independent branch from 0fb607e to 9b252ee Compare June 22, 2023 15:23
@egorzhdan
Copy link
Contributor Author

@swift-ci please smoke test

@egorzhdan
Copy link
Contributor Author

@compnerd I put up a patch to update the Windows scripts (swiftlang/swift-installer-scripts#213) to accommodate for #66765.
This PR does not affect Windows.

@egorzhdan egorzhdan requested a review from compnerd June 22, 2023 15:25
@compnerd compnerd dismissed their stale review June 22, 2023 15:31

Doesn't impact Windows

@compnerd
Copy link
Member

Ah, right, because this is for libstdc++ only!

@egorzhdan egorzhdan force-pushed the egorzhdan/libstdcxx-arch-independent branch from 9b252ee to 67eaebb Compare June 22, 2023 18:15
@egorzhdan
Copy link
Contributor Author

@swift-ci please smoke test

This moves `libstdcxx.modulemap` and `libstdcxx.h` from `*.xctoolchain/usr/lib/swift/macosx/arm64e` to `*.xctoolchain/usr/lib/swift/macosx` to simplify distribution.

rdar://110788977
@egorzhdan egorzhdan force-pushed the egorzhdan/libstdcxx-arch-independent branch from 67eaebb to 3e28a7c Compare June 22, 2023 21:04
@egorzhdan
Copy link
Contributor Author

@swift-ci please smoke test

@egorzhdan egorzhdan merged commit 12f01ce into main Jun 23, 2023
@egorzhdan egorzhdan deleted the egorzhdan/libstdcxx-arch-independent branch June 23, 2023 11:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
c++ interop Feature: Interoperability with C++
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants